Merge Develop into Main #67
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ts. The migration on mainnet was successful, i.e., the code ase can be cleaned for the next updates.
Bridge Adapter
* forge install: openzeppelin-foundry-upgrades v0.4.0 * fix: add .env to .gitignore and fs_permissions to foundry.toml * feat: use Ownable2StepUpgradeable * feat: disable initializers in implementation contract * fix: add foundry out env in build.gradle * fix: set ffi to true in foundry.toml * fix: add initialOwner param in constructor NatSpec
Bridge Adapter supporting bridge v2 and v3 without contract update
Use encrypted wallet file and env variables for adapter deployment
* fix: update checkout version to fix ci-cd workflow * fix: update setup-java in ci-cd workflow
* feat: remove bridge version v2 * feat: prefix bridge version key with V1 The bridge version will be deleted from storage in the update to v2. Prefixing it with v1 makes clear it'll no longer be used in v2+.
Remove check witness for owner in deployment
Add balance checks after the bridge deposit invocations
Allow dynamic gov contract for bridge adapter int-test
* feat: (#80) Add quorumVotes to ProposalData * add migration and test * fixes after review * wip * failed test attempt * use v1.0.0 nef and manifest * fix: use pubkey for members instead scripthash * test: create/endorse/vote on proposal for updating the gov contract * fix: use pData in update instead of update data * test: use appropriate phase lengths for migration test * test not yet working * add proposal validation in setup * fix update bug * chore: only calculate quorumVotes when necessary and move memberCount * chore: move quorumVotes to Proposal struct (#87) * remove old style proposal check when executing --------- Co-authored-by: Michael Bucher <michael@axlabs.com>
There was a problem hiding this comment.
Pull Request Overview
This PR merges Develop into Main while integrating formatting improvements, configuration updates, and new submodules to support both Neo N3 and Solidity contracts.
- Updated formatting and parenthesis placement in Java deployment files
- Upgraded Gradle wrapper and GitHub Actions workflows, and added foundry.toml configuration
- Added and updated dependency and remapping configurations in package.json and related files
Reviewed Changes
Copilot reviewed 77 out of 79 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/deploy/java/com/axlabs/neo/grantshares/Deployment.java | Formatting updates for improved readability |
| src/deploy/java/com/axlabs/neo/grantshares/DeployConfig.java | Formatting updates for closing parentheses |
| remappings.txt | Added remapping entries for proper dependency resolution |
| package.json | New package configuration supporting both chains and toolchains |
| hardhat.config.ts | New Hardhat configuration with remapping and Foundry setup |
| gradle/wrapper/gradle-wrapper.properties | Gradle version update from 7.2 to 8.10 |
| foundry.toml | Foundry toolchain configuration |
| README.md | Updated documentation for contract deployments |
| .prettierrc & .prettierignore | Prettier configuration files updated |
| .openzeppelin/*.json | Updated Subproject commit references |
| .gitmodules | Added submodules for forge-std and OpenZeppelin projects |
| .github/workflows/build.yaml | GitHub Actions workflow updates for checkout and JDK setup |
Files not reviewed (2)
- .idea/codeStyles/Project.xml: Language not supported
- .idea/codeStyles/codeStyleConfig.xml: Language not supported
Comment on lines
+75
to
+77
| // This fully resolves paths for imports in the ./lib directory for Hardhat | ||
| //@ts-ignore | ||
| preprocess: { |
There was a problem hiding this comment.
[nitpick] Consider adding a clarifying comment about why ts-ignore is necessary here, or explore refactoring to remove its usage if possible.
Suggested change
| // This fully resolves paths for imports in the ./lib directory for Hardhat | |
| //@ts-ignore | |
| preprocess: { | |
| // This fully resolves paths for imports in the ./lib directory for Hardhat | |
| // Suppressing TypeScript error due to missing type definitions for the preprocess property in Hardhat. | |
| //@ts-ignore | |
| preprocess: { | |
| // Suppressing TypeScript error due to missing type definitions for the eachLine method in Hardhat. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.